New hdri stitching software #678
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
All channels need to be set to zero including alpha for RGBA colors
simogasp
requested changes
Aug 8, 2019
src/aliceVision/image/io.cpp
Outdated
| for(const std::string& format: supportedFormat) | ||
| { | ||
| std::vector<std::string> extensions; | ||
| std::string str = format.substr(format.find(":")+1); |
| @@ -93,7 +93,7 @@ float sigmoid(float x, float sigwidth, float sigMid) | |||
| * @param[out] buffer - to store input metadata in output image | |||
| * @param[out] imageAlpha - output RGBAf fisheye image correctly oriented | |||
| */ | |||
| void setFisheyeImage(image::Image<image::RGBfColor>& imageIn, oiio::ImageBuf& buffer, image::Image<image::RGBAfColor>& imageAlpha) | |||
| void setFisheyeImage(image::Image<image::RGBfColor>& imageIn, const float blurWidth_param, oiio::ImageBuf& buffer, image::Image<image::RGBAfColor>& imageAlpha) | |||
There was a problem hiding this comment.
const not necessary with primitive type
| const float maxRadius = std::min(width, height) * 0.5 * 0.95; | ||
| const float blurWidth = maxRadius * 0.2; | ||
| const float blurMid = maxRadius * 0.95; | ||
| const float maxRadius = std::min(width, height) * 0.5; |
| @@ -188,7 +188,7 @@ void fisheyeToEquirectangular(image::Image<image::RGBAfColor>& imageIn, const in | |||
| * @param[in] rotations - contains adjustment rotations on each image set by user | |||
| * @param[out] outputFolder - output folder path to write panorama | |||
| */ | |||
| void stitchPanorama(const std::vector<std::string>& imagePaths, const std::vector<oiio::ParamValueList>& metadatas, const std::array<std::vector<double>, 3> rotations, std::string& outputPath) | |||
| void stitchPanorama(const std::vector<std::string>& imagePaths, const std::vector<oiio::ParamValueList>& metadatas, const float blurWidth, const std::array<std::vector<double>, 3> rotations, std::string& outputPath) | |||
There was a problem hiding this comment.
- no const for float
- missing & for
rotations
| @@ -362,7 +370,11 @@ namespace aliceVision | |||
| T( ( Z )( *this )( 3 ) * val ) ); | |||
| } | |||
| }; | |||
|
|
|||
| /// Instantiation for unsigned char color component | |||
There was a problem hiding this comment.
using RGBAColor = Rgba<unsigned char>| { | ||
| imagePaths.push_back(path.string()); | ||
|
|
||
| oiio::ParamValueList metadata = image::readImageMetadata(entry); |
| boost::smatch what; | ||
| if(boost::regex_search(dateTime, what, dateTimeExp)) | ||
| { | ||
| times.push_back(24.0 * std::stof(what["h"]) + 60.0 * std::stof(what["m"]) + std::stof(what["s"])); |
There was a problem hiding this comment.
since this part is repeated here and in the previous if branch, maybe consider to refactor it into a function. the only difference is that here you are doing something with a single file, in the previous one you are doing the exact same thing for each file in the directory
| return EXIT_FAILURE; | ||
| } | ||
|
|
||
| int nbImages = imagePaths.size(); |
|
|
||
| // sort images according to their metadata "DateTime" | ||
| std::sort(times_sorted.begin(), times_sorted.end()); | ||
| for(int i=0; i<nbImages; ++i) |
| std::vector<float>::iterator it = std::find(times.begin(), times.end(), times_sorted[i]); | ||
| if(it != times.end()) | ||
| { | ||
| std::size_t index = std::distance(times.begin(), it); |
In fact, it doesn't really make sense to add weighting in the BA context.
…onPrivate into dev_hdri_stitching
Also supports value 0 for automatic detection of the number of brackets.
…y and minor code simplification
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Stitch fisheye images into 360° panorama with simple geometric transformations, without undistortion or feature matching.
Features list